Revert e504237..73da8cf

This rolls back to commit e504237b887cfd892ac58d0dd54da4a7b0742afa.