It was already working, just want to make sure we don't break it in the future.
See #1221 (closed), #1348 (closed), #1553 (closed)