This is not ideal, but it gets us closer to what we need. Fixes #556 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>