Yes, but this was actually intended previously (ed0bc8d), but I didn't do it correctly/completely.