Changing to new set form. (reverse-merged from commit 2d0b15adf4aff4f856e96e9f68af62473f099a6b)