Revert last changes as they introduced other problems.