Revert 49aef50..5a725c3

This rolls back to commit 49aef506d699d1965f748a509589d63c577418aa.
Revert 5a725c3..e937104

This rolls back to commit 5a725c3b8da2d0bcbe7ce1739562f5169923cd22.