This reverts commit 79f6a814. Didn't notice that someone had reverted the commit that caused the problem.