Revert 4357262..e6172e7

This rolls back to commit 4357262da701c74cf7fd3b20dfcca8a8858c8537.
Revert 1aa837f..10c0f00

This rolls back to commit 1aa837f16762cadab70688758f93f7f359938ba6.