diff --git a/metadata/com.twofours.surespot.txt b/metadata/com.twofours.surespot.txt
index cac1db9c08..3b17505038 100644
--- a/metadata/com.twofours.surespot.txt
+++ b/metadata/com.twofours.surespot.txt
@@ -87,25 +87,22 @@ Build:64-mod,64
     commit=b6889acbbf451dcb7421540511b62fc9375b6215
     subdir=surespot
     gradle=yes
-    prebuild=pwd && \
-        pushd ../ && \
-        git clone https://github.com/zoff99/gcm-client-old.git && \
-        popd && \
+    prebuild=git clone https://github.com/zoff99/gcm-client-old.git && \
         mkdir -p src/main/java/com/ && \
-        cp -av ../gcm-client-old/com src/main/java/ && \
+        cp -av gcm-client-old/com src/main/java/ && \
         mkdir -p ../surespotcommon/src/main/res/raw && \
         printf 'ssl_strict=true\nbaseUrl=https://server.surespot.me:443\n' > ../surespotcommon/src/main/res/raw/configuration.properties && \
         pushd ../ && \
-        find .google_apis -name '*.jar' -exec rm {} \; && \
-        popd
+        find .google_apis -name '*.jar' -exec rm {} \;
     scanignore=surespot/src/main/res/raw/ffmpeg
-    novcheck=yes
 
 Maintainer Notes:
 * Voice function removed
+
+Why on earth do we need to git clone? This build is begging to break
+itself.
 .
 
-Archive Policy:2 versions
 Auto Update Mode:None
 Update Check Mode:None
 Current Version:64-mod