Adding patch with suggested solution (it should work fine for 8.3.x as well)