Undo accidental revert of commit 40bc27c42c631a83c6436f805e5d6d42ed1c99c2.