Revert "Merge branch 'experimental'"

This reverts commit 56e352599bf634abd91ba0d3ef2794c75494ae03, reversing
changes made to bf1bbd4d606e9b233fe823faaf6c31392888ffce.