Revert "Merge branch 'pryor'"