Revert "Viper build.prop changes"

This reverts commit 34f7aafc1ad337f1ba88d9f5dc20b9b9fd62b96a.