This reverts commit cf0a21d Apparently that doesn't integrate that seamless in all environments.
cf0a21d