Revert "SDS, 5.2.7 - 5.2.8 :3"

This reverts commit f7ea69511963e96dc395eb1c2cd4006e20aa5bad.