Revert a0e38d7..9ee376c

This rolls back to commit a0e38d7aa139f4a7743d0227a3baf465666219b3.