This can be removed when #177 is resolved.