Revert d302c2a..e05958e

This rolls back to commit d302c2a00e16928bf0ad2a7ea4a1bf2d0716f72d.