A slight tweak for bug #6557.  It now only returns 1 on success and 0 on failure.