Remove sketchy workaround