CRITICAL FIXES DO NOT REVERT