DAR-2534 reverting DAR-2182 fix