Reverting version back for easier merging upstream