Removed duplicate code that had broken 'run-as'