Revert 8562b2b..19fd370

This rolls back to commit 8562b2b84779ada7b297462f9534004484ba6653.
Revert 40202ab..4180adb

This rolls back to commit 40202ab6e217531a96c19d85c22750c7364e072a.