Revert "Fix for new AS"

This reverts commit 49dedbf6355736ef2f5d3cd1e8cd850a32a97035.