Revert b0bcc35..4fc17a6

This rolls back to commit b0bcc35f6d12fb81da194d616054940fe8a3b920.
Revert 4fc17a6..c0da448

This rolls back to commit 4fc17a6543a43c26075dcb8679421898741aa55f.