Reverting from MTAFBy to By