Revert "Small cleanup"

This reverts commit ea46fc0be0f6a1e9b464340bf2a2819d81797653.