Revert e62e6dc..c4da33c

This rolls back to commit e62e6dc676061b3882254695c910204acc17b7b0.