This reverts commit 42d794561c1f3809f95299e4aa04cd3f28d4239b. My bad. Bad logic on removing, it was an option anyway.