Reverted Tea commerce commit