Revert 367ee7a..eb6f9d3

This rolls back to commit 367ee7ad245d0f736d6eea4d31078956c08ebec4.