...so simplify the design a bit here (and there was no meaningful failure-
handling code, anyway)

Change-Id: I34bb3a7b5fc56f2213a4d22438f0733e1b65fe4b