Reverting 2.0.0-M06