Reverting to version 1.18 for patch from this point