Revert "Merge branch 'master' into bigboot-info-page"

This reverts commit 9bd070cd8bafc44cfd2d07aa5d29ed5b1264e803, reversing
changes made to 2fa6b81817874e245f21d9aebb58ef943d0576bb.
Revert "Revert "Merge branch 'master' into bigboot-info-page""

This reverts commit 51d173388837a7501b207f706be35810cb57e037.