Rolled back to working code.