Regression from 590bee4 & f935220