Revert 152f88e..95b7450

This rolls back to commit 152f88ec573957caf1bc978e1eb4d215d4080237.