DAR-2121 | Remove code introduced in DAR-1859