Reverting to 2.5 for android issues