PR feedback (remove unnecessary special casing).
PR feedback (remove unnecessary special casing).

rvarshney/code-dot-org,dillia23/code-dot-org,pickettd/code-dot-org,dillia23/code-dot-org,rvarshney/code-dot-org,pickettd/code-dot-org,rvarshney/code-dot-org,rvarshney/code-dot-org,pickettd/code-dot-org,pickettd/code-dot-org,rvarshney/code-dot-org,pickettd/code-dot-org,rvarshney/code-dot-org,pickettd/code-dot-org,pickettd/code-dot-org,dillia23/code-dot-org,dillia23/code-dot-org,rvarshney/code-dot-org,rvarshney/code-dot-org,pickettd/code-dot-org,dillia23/code-dot-org,dillia23/code-dot-org,dillia23/code-dot-org,dillia23/code-dot-org