Revert "Merge remote-tracking branch 'origin/dashboard'"

This reverts commit 10fbb2f55cd6cb70dfef3d2613a6c47b39969045, reversing
changes made to 4217a3604e0fb4e77642809f357c8cc2b117ed92.