Other half of commit for e8fc637 (fixes #280).