Cleanup 13508

Since 13508 is fixed, this should now pass.

(I only have access to the web GUI for this, don't merge until full green)