Fix breaking changes due to issue #7021

Signed-off-by: Richard Eisenberg <eir@cis.upenn.edu>