Revert "Use our utility function."

This reverts commit a099b44e43407d8aa8ca440c921b3719e3e34df7.