Revert "Small cleanup"

This reverts commit 45f3fee855336e5cac60209102b7207ca71dfead.