Re-enable p2 build to work standalone
15 files changed