Revert some scenario stuff