Revert 109f21b..6a6fe31

This rolls back to commit 109f21b7b1acb91461541e171dfa08c84e8b30f2.
Revert 017c313..5875c33

This rolls back to commit 017c3134274e39f7489862abec4ee9f13393f5c4.