Reverting fix for Mantis 977 (L61115) (breaks DROP and no_implicit_actions).