Revert 39da3f4..422a5af

This rolls back to commit 39da3f4fd4f0ffb45985af3a7407dfc070c39a86.