fix unmarshalling. no, really.
fix unmarshalling. no, really.

Signed-off-by: Evan Short <5b1db704470d35a058f1f4a9e1a5a172a6ea69d3@pivotal.io>
Signed-off-by: Corbin Halliwill <38cf05332854d0c00b392ad9da3fb5cec295aa83@pivotal.io>

zachgersh/atc,zachgersh/atc,zachgersh/atc,zachgersh/atc