Revert ba193ef..2a34628

This rolls back to commit ba193ef2dd6ee0c08ef6003270e2d94858f518f7.