Revert 0831a9b..793ddae

This rolls back to commit 0831a9b04f5f28c2cf0e90baa98d3e2202a8ea9c.