Revert d739197ee4ac8ac5b73e316baae5c6932ccc7b9a

Signed-off-by: Austin Seipp <aseipp@pobox.com>