Revert e583451..bcd9fb1

This rolls back to commit e583451e4c802d45ae981e318feeebbc6232c2e3.