this patch hunk seems to drop the "defaults" and "play" shims entirely, is that correct/intentional?