Revert 760e44a..1d23536

This rolls back to commit 760e44a8f8abe89031109cc5ee8506cafad8fff6.