NX-620: Fixing the build

Tests, but not prod code got broken by change introduced in
afc59ff0bcac3f56e54f272df3248e3077124ae2