Revert 4e5dee5..79ee3ec

This rolls back to commit 4e5dee54d1c1c095bbd49369549d5f9b025bf120.