Revert "Updates for 10.2"

Merging changes for 10.2 into 10.1 was a bad idea

This reverts commit e48b3b6636f1c62b92b3570da85125caef8d0270.