Revert "Merge branch 'master' into feature-multi-icon"

This reverts commit 24dfc0e47be902226784f5ab5d25e4e1956ddf36, reversing
changes made to 63e4d720e5a81ba3a9497ef5e06e692c438fab28.