* Revert changes made in r3868. We have a better solution now