Revert a610c68..ae0be6e

This rolls back to commit a610c680bf05f98d5f420f9491a9a0590162ee70.