Temporary work-around to errata nvrs getting out of sync