Revert "Modified RuntimeTraits per recent 2.066 commit"

This reverts commit 5a277f9ee82ce0eeaafb42f296a8bf566906627a.