Revert "Merge branch 'master' into anna"

This reverts commit cecee3d465b801fac5651b9797aa1c0958f8bdc7, reversing
changes made to 7ceb64024cdf54a4b2d4d7d8e31bbaa2a2edc4ed.