Revert "re-apply bugfix that steve seemed to have skipped."
This reverts commit 92d3b666aadf2f40215326e8095753a9c6c1ea5c.