This reverts commit 66fc303070a8ed731ffcb8733b825a03d5a2babe. There is still a patch that doesn't apply.