Revert "fixed the merge to include new imaging"

This reverts commit 1e3a9c577c5052a8a8f8fd481ffcf65b2bdff4e8.