#2464 undo changes on #1970