Use available function

Which also happens to have the correct code
Merge remote-tracking branch 'origin/master' into 1.4.6