Fix #504.
Undos pull request #493.