Revert merge from Jn Blechta. Breaks tests.