Marshal monkey-patch deprecation

For #620