Revert back to 2012 version