Seems like a good plan.
Would it make sense to add a comment in this method to warn about that? That way we know that we need to keep hands off of this code.