reverted a safeguard that broke clusters in npmt