Revert previous "fix" - the breakage was due to some