pull in david's changes
Revert "pull in david's changes"

This reverts commit 06d266ae91eff201ebfb8b793188aee5b4c22025.