Revert fb17841..4c69337

This rolls back to commit fb1784101449b8a3d0a1b5e0a7209634fbda56ed.