Revert to the state from before SPA

Which it didn't work as expected
More reverting