Update: v2.1-480-ga06ee6e
Remove an unnecessary patch