Recommitting r180831 with trivial fix - remember to return errors if you compute.