Revert "Merge branch 'DAR-36' into dev"

This reverts commit f7ae0d364484740e252aa4d54189ba09996c4367, reversing
changes made to afe44e145561ceb69bd9361ee123685c717cde58.