restored regressions after potential NPE fixes
rolled back NPE changes