It shouldn't ever create the set at this point though (cherry picked from commit 3ea725a863c148c12884b3f5a94262eb58b5deaa)