Reverting changes from 3cad9398, originally introduced in 0b46154f NO_DOC=testing NO_TEST=testing NO_CHANGELOG=testing