Respect recent master changes. Fixes #271