restored non JSON parsing version