Undo spurious change made in r256965