Remove needless workaround