We were young and foolish back then. It's weird to have a cart reference in Swat but it's already there and this PR improves broken parts of it.