Revert "build: don't drop 'user' flag when using the ImageBuilder"