Revert 8e5163d..5b56168

This rolls back to commit 8e5163d6f887cd6d5ad5e4854ee25949e2b48b08.