Merge "Reverting code to old flashing code"