Revert 1.2.18 for fixes