Revert to jan 20 2012 commit