Revert b9c0507..3052733

This rolls back to commit b9c05079678993205e5d7334e4967d454969088c.