Why is this code necessary?  I thought that we didn't change any default behavior.  Do we need to update all the examples?