Reverting proguard merge