Revert PR#2 because it broke master.