Revert ec0cb04..e861da4

This rolls back to commit ec0cb04cb139378b854a95928b077823a30703da.