Revert 2653ffa..8ca1f8c

This rolls back to commit 2653ffa747a30560a4a3d6ba75ef7406fde1dfbd.