eglaysher Merge pull request #952 from eglaysher/revert-meson …