I'm moving some files around and this will need to be supported.
Created attachment 63654 [details] Patch
Committed in r64794