Reverted SotM change