Revert last part (work in progress of last two commits, I guess).