Reverted a change lost in the 3.1 rebase conflicts.