Buming up the version for this checkin
Reverting the commit so that I can split it into two