Revert ba70617..4f2c9ba

This rolls back to commit ba706177cbc0ffd48f6bfc32352cb3046f0d9f57.