• Reverts revision 9126, because it was causing a lot of other problems.