This reverts commit 4f8e065faf055d3f0463a92622297ca3afac07f4.
Signed-off-by: Jess Frazelle <acidburn@microsoft.com>