This is completely untested, but it seems logical.
(cherry picked from commit 89d23df7d82a27c42cfa3a52d4008e34130bc99f)