Minor cleanup
Revert "Minor cleanup"

This reverts commit 4fde870828a1a467280d9c8339b6c13225cb70e8.