Revert "SAPE up redux"

This reverts commit 0ea925def69bdad845a51d13b43845d6af646280.