Revert "Hrde bugs"

Reverts gem/oq-platform#266