Revert "Fix last commit to preserve some use cases"
Revert "Fix last commit to preserve some use cases"

This reverts commit 71c88be5d5078dd644ec0af61bd5d451035f2ad7.

wenyang-li/FHD,miguelfmorales/FHD,EoRImaging/FHD,wenyang-li/FHD,EoRImaging/FHD,miguelfmorales/FHD,wenyang-li/FHD