Finally! at least the hierarchy is right

There were some issues due to the changed use of this code.

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