fba008e298
Things has stabilised since 80a18fe2fa, so it makes sense to remove the unconditional masking for ease of debugging.