Revert back to a working version