[mr2756] fix crush, picked in 12409.