Simplify code a bit here to remove the duplication
Needs ReviewPublic

Authored by schwarzer on Aug 14 2019, 12:01 AM.