Revert 0645ff2..97acc56

This rolls back to commit 0645ff248c0c9cfa50320bd6bf8adfc2f67fa6a7.