Revert 515ac04..fee3c05

This rolls back to commit 515ac049789634bf8277d1ab281b6a81d694233c.