@ahocevar - would you mind adding a comment here with a link to #404?