Reintroduced changes dropped during reset, hopefully properly merged now.