Reverting to 2.0.0-beta-3