Revert 35fdbde..b57dae6

This rolls back to commit 35fdbded623fe6f7599f724b0d24a31b7db18908.