* 21w44a stuff
* look man idk
* Apply suggestions from code review
Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>
* Remove things mapped in #2729
* Restore things that shouldn't have been removed
Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>
Shnupbups