Revert bb6866b..b1c0de1

This rolls back to commit bb6866ba072ade9382e7a4ee97dab09b702598db.