(and remove duplicate copyright statement)
(cherry picked from commit a4549f89)
Closes #1951 (closed)