Revert "More Dragos Magic."

This reverts commit 864278b9dba9086716909005b2c4521d128f488d.