Put #1922 in unstable until we can test it