Commit fae748a8924962dc389eb08e2363b5cdf1cbe67e is buggy.