SUS-1387

Fixing SUS-1387 was an out-of-body experience.