OP-1117_readd_a_change_lost_in_git_shuffle