Reverted file to 2.6 state