Rebuild for 2.0-BETA4