Backout d8018c23945a for NPE failures