Revert e42a401..1452ebf

This rolls back to commit e42a4011efc2a0291e7bb9ed762679e3b9ea04b2.