Revert "update to r3"

This reverts commit 0901266c54d35b5772b6a856b4c1a8f45d1187c3.
Revert "Revert "update to r3""

This reverts commit 74f2e0a2e6b3ad249b5bc11d3e62867c7734069e.
Merge branch 'jb4.3' of https://github.com/RemixPA/manifest into jb4.3