Revert 196b8e0..9f6ba70

This rolls back to commit 196b8e053d64a8f355a47b8bdaf9cd9237aa104c.