Reverted to working version.