Revert "apply patch to features"

This reverts commit 6569e5a6533d98e434020fb5d87c1434c2f543e8.