FEND-828: reverting earlier change