revert 673fd80 and fd12dba