Let's try that again

Now as long as you have not made any recent changes then this pull request should apply cleanly.