Revert 8e6ad26..6736802

This rolls back to commit 8e6ad26ce1cf246449515412bc967bbcebc377ff.