Revert 5f6eb3f..80d457d

This rolls back to commit 5f6eb3f21e7a9a0a27af23d3450a7b66be7ff148.