Revert system.prop

Move testing to new branch to allow easy switching for test/community builds.