Revert "Re-adding set class to ast so naming can be retained."

This reverts commit 24fb2c5ef6bf2f56bae60b38ab87b036a0514103.