Reverting to be more in line with mainline