Restore author credit
Land #3213, @todb-r7's fix