Revert "PLA-1605 approach changed"

This reverts commit 1d39b2074d1f6b0212a90f5cc44fe23e8668dc9d.