This reverts commit 4e37121f.
I didn't realise that as 2.3 is stable and released, this is a string freeze break.
