Revert own fix, use official one