Revert cc74d3d..95b82d4

This rolls back to commit cc74d3df0d1106484e3cc06ecb882c68c62505f5.