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

This reverts commit 8211349d58a9b0b37026d26d28d26591e08be3f4, reversing
changes made to d53ab4c1b33f4020e5f5d9c113dba15fb92dc789.