Revert some unfortunate modifications that were breaking LocalMinima, Sobel and Component