Revert 6f0d682..94d5043

This rolls back to commit 6f0d68292ed0f1c59235426f9e4ab1b18bdd1808.