NEXUS-6182: Improved method name
NEXUs-6182: Get rid of dupe code