Reverting to 2.2 functionality