Revert last commit. Implement that fix in master.