Reverted change to vendor code