Revert to 2.19NS