Revert e589ee4..2eccc25

This rolls back to commit e589ee44d07b7dab5e26bd72000153ff2fc76f45.