Reverting fb248ea6a21e43c1090c283459c1e2442e6f6149.

Commit 6c7ecc4223fcf419ebf47bd412247cd72951a7a0 should have fixed the
problem.