4fa4bb7f72
We need to cleanup the controller _after_ we're using the step related to it. Destroying it before reintroduces the original issue from MDL-80553.