CB-5698 Fix non-compiling code in previous commit