I think so. I'll file a bug to do it separately.

We'll need to test it thoroughly on Travis too so let's do it separately.