*reversed "fix" to a regression made in a previous commit (see commit 28b0256f12bd1652ad0dfc743c08208746c6e829) and removed the old commit that caused the regression in the first place.