Revert "FL-663: add dmraid fixes by Alexandre Pereira"

This reverts commit d79330fae28ef2fe86cd3be044402e8db27c0493.