Revert bb480cf..d4446d6

This rolls back to commit bb480cf727fa39e67cdb4fc32a226543ea45a8db.