Revert "simplify"
Revert "simplify"

This reverts commit 47261c5dda1c85da413ba14a367b795c41ec94f3.

tobiipro/support-firecloud,tobiipro/support-firecloud,tobiipro/support-firecloud,tobiipro/support-firecloud