Moving to 5.3.5 for now as it's not a regression. Will see if it can make it before that if all goes well.