Revert 6a0fbf8..6ef5462

This rolls back to commit 6a0fbf896f73c3190e363e3f74e8d4ee023479b3.