Structure (reverted from commit fd0a1e1141c95a8e852f8320555a47aecdd55793)