Hae

This replaces https://github.com/crowbar/crowbar/pull/1978