Revert "Reapply a patch"

This reverts commit cda727390afb30153fa809c686448ed1b459dcfc.