I just realized I can remove this hack now :D [ci skip]