Revert to working version