Revert previous "removal of copy-paste code" to fix issue.