Revert c2055e6..f81da0c

This rolls back to commit c2055e62f305de9cea059bdd9bba45c72a37160b.