Revert the "Show" constraint portion of 16cd121