Revert "LPS-39749 Add back the shortcut path, for the same reason as we did in ServiceBeanMethodInvocation.equals()"

This reverts commit 453d9b074ab5614152ced59de033e5c7129c0f05.
LPS-39773
LPS-39644 Upload logo causes javascript error
LPS-39644 - Source formatting
LPS-39644 - Source formatting