revert pull #1667