Revert "Merge branch 'master' into LinusFeatureBranch"

This reverts commit 86ff238a7b3728cf187b775cf8c418f28cb789c3, reversing
changes made to b5359e584c977d83b87fa854b15459933caae815.