Patch implementing this: