Revert "Merge remote-tracking branch 'origin/master' into LogSubsystem"

This reverts commit b2f6cbd2b0f4cf4975bfec9b7e22ec533ce3520f, reversing
changes made to a4774adaa659973330daba15557352874d576559.

This merge was performed incorrectly.