Cherry picked from f35fec35 to undo reversions caused by git newbie