Revert e488a77..4a8f6a0

This rolls back to commit e488a77ce70cc1dfc5c8646d9540209d8c2b6d8e.
Revert 4a8f6a0..f536732

This rolls back to commit 4a8f6a0aaa7051b918379a5030a8236573a5b578.