hacky indeed but I hope we can phase this out soon - at the latest when 4.4 eols.