NEXUS-6492: Reworded according to Stuart's suggestion