Revert 6f41aca..0e957cd

This rolls back to commit 6f41aca4e14d09b13dde029f7f48e77e53539141.