reverted back b/c finally fixed production issue with json parse