Damn, so there truely already was a PR for that. I've created a seperate one yesterday => https://github.com/crowbar/crowbar/pull/1964