Revert "Initial import of patch."