Revert 7a56eb0..58928ba

This rolls back to commit 7a56eb0ef5c566d1dddaa8e18d5b1977f7ae2646.
JSON P version