Reset bitfields patch

See carothersc/ROSS#f8a3b1157cb8b32de8475145deafe5b2fff4b536