Ported old IITC hack to plugin