BUG: revert last change - wasn't needed after all