This fixes an issue where state bleed from the parent to the child

I also made this small change in master which should eliminate possible gotchas with the `built_in` property: 3d656b2c8777060a3c1dd7c291225604099ae6e4