Meh. Fix error in last cherry-pick #bfe14a12b430f9b411c69b1568d3120c5c727d1b