Revert "Catch up with Slim"

This reverts commit edeed9b98b97a8d9f8c2e3254b394173589ee0a4.