Fix bug 2712, reverting changes to file