Revert e88e754..0bd2edd

This rolls back to commit e88e7541a7a5cd4a00a81612fabddddab6a0a965.