reverting to 1.2-M8 and 2.2.0-RC1 because it's causing issues