NO MERGES UNTIL I FIX REPLICATION PLZ

Change-Id: I6679420c0a3254f669631eb60376f79acc490d80
Gross workaround for broken replication
Fix funk