One of the devicelab tests is broken after this commit - rolling to last known good commit while I investigate.

/cc @bkonyi