Because I made a mistake? :)

This PR isn't meant to be merged as-is; it's for people and me to use until real support is implemented.