Revert 5a26ed9..937b918

This rolls back to commit 5a26ed9943dd4614fa4b438a811ce61b48422344.