Fixes hacks from progressreader refactor Upstream-commit: 23699f5a29ebc166fbf05e0b093725b2bda31ed7 Component: engine