Put back the hack that was originally in place.

Signed-off-by: Ken Cochrane <kencochrane@gmail.com>