This reverts commit 67980fb

We want 407_0 to exactly match upstream's 4.07.0