Revert "more asp changes"

This reverts commit 104acc284d034a1117872867def3dc571efabc82.