Other patches appear to depend on this patch. Revert "I ran into another patch problem in the falcon-st-opt patch, and since it appears most of the changes have been merged already I am removing the patch."

This reverts commit 41c64c46c06ebc1bb2051d4ff3340e91e7b56010.
REMOVE_ENTRY was replace by remove_entry, but then used in another function.