This fixes #7998.  It now uses fixtures to push up devices.