WTF upstream. ZREM still does not work correctly.