Missed this in previous commit - bad idea making even small changes late at night ;) (cherry picked from commit 3daa6a97)