rolled back unreleased resource fixes