Revert "Revert this asap"

This reverts commit 4400df1be54282490c2ac7eb10132dc66cfe932e.