Backed out commit [6260], was causing too many problems. We'll have to bite the bulle...