Reverting these once to get a clean merge...