Revert "First try of hybrid client side and server side layer aggregation"

This reverts commit 2f84e5f2d5d21a96e10200cf836e16e7675559aa.