Revert "Merge branch 'master' into alex"

This reverts commit 9ce5ed97210cd69242084704efa227436e6a97b0, reversing
changes made to 590cc4cba2ac5dd030683462df5d11b261557bda.