Revert "Small cleanup"

This reverts commit d432858f976803d72b3e52176f072b40e23022db.