Save lost changes
Land #2974 - Recover missing code in method exists?