Revert "Squash Slim commits"

This reverts commit 9fbdc0f4321a0a98c567ae03339e3fc791081ce6.