Revert 079ea60..0566b7a

This rolls back to commit 079ea60d25f0d36775f476359c588c4e8a3a14e2.