Remove monkey-patch