Revert "Merge branch 'master' into integration"

This reverts commit 2e8f63a8690dfbb60d9dddf84e00626ee03b36fa, reversing
changes made to 330af31a187e1968457ecfc4f735753ef6522f42.