undo my changes to suppres 5.4 strict warnings