[FIX] Removed old bad workaround