Re-add support for masking on the server-side