Includes fix for a crash in Attribute access that the original patch was causing.
This reverts commit 63444c8c.
cc @mlaurent