Revert f5de2c6 and 82546b1