Reverting commit 3a77310
reverting change in /test/util.js