Revert "Minor cleanup"

This reverts commit a8523c8dc35fcfbb8cf2e69d296fbcc8981cddd0.