Revert "speculative fix (bug 1000992)"

This reverts commit 4809587986b9f5487459659c5258ced05fa8a81e.