Refactor #3370: Resolve bug in simulator readaptation