Revert "These are already in the patch"

This reverts commit ab6e7fe0b789f8884db6c913195caef76d247daa.