Developer 801

This should fix DEVELOPER-801, including DEVELOPER-763 so we can test the problem @wesbos reported.