Shouldn't we remove these lines? I think It's not needed anymore if the pull requests from @jverdeyen are merged.