This reverts commit 16ff91eb. Several errors were reported mainly test-suite execution time. Reverted for investigation.