Revert "More merges from bleedingedge to experimental..."

This reverts commit 9a59dea9696872b61776a9fd2069ccce7d754fda.