Slightly more working but we're back to not working.

Signed-off-by: Ronald G. Minnich <rminnich@google.com>