Rolled back to working version.