Revert "Issue #3438769 by vinmayiswamy, antonnavi, michelle, amateescu: Sub workspace does not clear" This reverts commit c1f7b85d. (cherry picked from commit 2b536b6c)
