reverting some changes to keep upstream kompatibility to example42