Adding this back in as a long-term solution to the current workaround. See GoTo image for reference.