Packaging, issue #1422: Revert exec docker for now