Reworked the changes for bug #64452