Reverting Mathias’ changes