This reverts commit 01c21653eee53a353ae887a47cd2b48165902383. It was applied by accident before it could be reviewed.