Revert 6846ee7..8be09c7

This rolls back to commit 6846ee70ee711aba18a23754bb42e03596622cce.