Revert e0fc781..b7d8ddf

This rolls back to commit e0fc78133b91c3dd44dfdabae03dbebf943a3e3a.
brown