Add a workaround for issue #1463.

See #1463 for discussion.