This reverts commit a44e2bff7e, reversing changes made to 06cefaf493. We are reverting the PR #825 because it breaks Master.
a44e2bff7e
06cefaf493