Revert "Refactor direct action metadata."

This reverts commit c2299e4d1461326c001ae70fd78f5ebc660bde69.
Fixed metadata