Attempt to fix an npe
Revert "Attempt to fix an npe"

This reverts commit be817aae460a49222a463f863a4e2d3cbdb7b1f3.