This reverts commit 67b5bdf99b19e5f04bae5fb82af91aa695fbfbb9. Reason: it broke device lab. TBR: @goderbauer