revert my revert

This reverts commit 61454eec3b1a4805774368eab0676c48fa1ba654.