Can you undo this change? This is the kind of thing that will make backporting fixes a pain.