Revert "REL-1301: Minor code cleanup."

This reverts commit b1ccafa1737f5f41050f26355e242664b624c41f.