This reverts commit 564c99782a. This actually doesn't work that well, so return to the original method.
564c99782a