JBIDE-17893: Revert the Beta3 branch to the Beta2 situation