Revert "Merged from master"

This reverts commit 89ab907765b4e11000ea7584bf7551889628a609.