Unlike the previous one, it's minimal and doesn't conflict with various staging patches that are also useful for TW3.