It's probably a good idea.  For example, once it's merged the debug_mode thing is implemented, so we'd have to remember to remove it here.  I do not feel comfortable doing this myself, though.