Fix issue with image size not correctly being passed to convolution operator

Closes #2089
Please don't do this.  Either remove the conditional or make a better condition.