Fixes #436, at least for now.