Although there are some non-trivial changes after that one was cut, including your @rule change