Revert 78984a5..5c71de5

This rolls back to commit 78984a50e9b3f55bafc19565e684966d1bcbf3d6.