Issue734

These were erroneously commented out because at the bottom of this function is a merge conflict that was commented out and unfortunately, the commented out version is the version that should have remained.