MTA fix

CherryPicked backout 70a3.