Revert 655c39c..3726c32

This rolls back to commit 655c39cc720e12385d27e73e62f95f5d244e10f4.