Revert a5f3e47..85272b0

This rolls back to commit a5f3e478b97f4b7f52862c2b0ece9f88f5ade499.