Revert "LPS-40761 Simplify"

This reverts commit 7555be641db294a4107b146ff983457501ae215e.
Revert "LPS-40761 Match your other existing  * @author Adam Brandizzi in other .java files"

This reverts commit e1d7db7f9b53f2a7a09b686fbb5948e11cf85823.