We have this nice function and we're not even using it

No sense in duplicating code...