Make ExtensionMethods whole again