Revert "Merge branch 'newlook'"

This reverts commit ce879cec199aa176e5e92df4bb274f78bdec74f1, reversing
changes made to 543a3b69f1bf46158bb5f7ded0cf2c1a970e37ec.