Revert 6c2341c..b70a2e3

This rolls back to commit 6c2341c3845ef45ac8e99abceac11c66ed99d6d0.