Reverted unnecessary changes for json vs jsonp.