Revert for bug #2315