Fixes issue described in https://github.com/ansible/ansible/issues/3658