Revert "Merge branch 'master' into integration"

This reverts commit 2b58a07ce06463626fd6e458e20bb9b0e0940450, reversing
changes made to 1eef17784a8d3af9cd5a257798a12f56de4d5b3c.