NEXUS-7789: Simplified based on Stuart's comment