Revert 07eb874..f76ccf4

This rolls back to commit 07eb874a12c6878940a91182d2a9b8d3ba2caac0.