Revert "Merge branch 'develop-import_tab' into develop"

This reverts commit 56d875f79dc0d116cffe502b424d9b5db73aa424, reversing
changes made to 2b15309f7c2d75b3bdb3f4babea283e309e268c2.