Revert 788bcb2..58f3d7d

This rolls back to commit 788bcb24fbd864f160f42bc03a7044ab377ce1f6.
Revert 1cde003..fbfa9b7

This rolls back to commit 1cde003d378710df469a34d7b63bae31df357ea4.