This reverts commit 738424b7ea720fca72b1d3810f400941b24165f5. patches need to be updated to support new version