diff --git a/closure-compiler.spec b/closure-compiler.spec
index 8962a14..f5a58c0 100644
--- a/closure-compiler.spec
+++ b/closure-compiler.spec
@@ -3,9 +3,9 @@
 Summary:    JavaScript minifier and checker
 Name:       closure-compiler
 #define commit ad29f06d581fb8c54ad031334b82a5c301b6ce0a
-#define shorthash %(printf %%.7s %commit)
+#define shorthash %%(printf %%.7s %%commit)
 Version:    20160315
-Release:    3%{?dist}
+Release:    4%{?dist}
 License:    ASL 2.0
 URL:        https://developers.google.com/closure/compiler/
 Source0:    https://github.com/google/closure-compiler/archive/maven-release-v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -47,13 +47,6 @@ This package contains the %{summary}.
 %autosetup -n %{name}-maven-release-v%{version}
 rm -rf lib/*
 
-# Compatibility with more guava versions
-sed -i -e 's/CharMatcher\.whitespace()/CharMatcher.WHITESPACE/' \
-  src/com/google/javascript/jscomp/deps/*.java
-sed -i -e 's/CharMatcher\.javaUpperCase()/CharMatcher.JAVA_UPPER_CASE/' -e 's/CharMatcher\.javaLetterOrDigit()/CharMatcher.JAVA_LETTER_OR_DIGIT/' \
-  src/com/google/javascript/jscomp/parsing/JsDocInfoParser.java
-sed -i -e 's/isSupertypeOf/isAssignableFrom/g' src/com/google/javascript/jscomp/ConformanceRules.java
-
 # Don't build shaded jar because it bundles all deps
 %pom_disable_module "pom-main-shaded.xml" pom-main.xml
 %mvn_alias :closure-compiler-unshaded :closure-compiler
@@ -94,6 +87,9 @@ install -Dm0644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 %license COPYING
 
 %changelog
+* Wed Feb 14 2018 Mat Booth <mat.booth@redhat.com> - 20160315-4
+- Drop guava compatibility hacks
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20160315-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild