156: Increase compability by not relying on as _ imports r=torkleyy a=torkleyy



Co-authored-by: Thomas Schaller <[email protected]>