Reverting changes in STAT waiting for fixes

No match.