Revert c930409..6f612f6

This rolls back to commit c9304093439efd2673609f9b13b86ff88d0e79cd.