Reverted bravura classes and metadata