nuke the buggy behavior re: 4869 - this probably has some side effects or something?