Revert "Merge from master"

This reverts commit bb1c229e37af8d438e660f3d35a4b15cd6e0d341.