Comment 7 for bug 1560942

Just to say, I think it makes sense that default swap behaviour should
be a core config element.