Fix @bradjc's broken commit 873a90687de