Revert "Revert to vanilla master"

This reverts commit ca2e9024738ea145e330b53f80026e85f90d0735.