Revert use of WORKDIR to save a layer