this is effectively a minimized back-port, 2.2 does what you say