It's not good to merge in workarounds or hacks. We started howling-mad exactly because there were too many of those in the dev branch.