Forced commit to record r254686/r254687.