DELTASPIKE-569 Improve DeltaSpikeResourceHandler handling
Revert "DELTASPIKE-569 Improve DeltaSpikeResourceHandler handling"

This reverts commit 82218970b4964f51af92d453cad89425e902132f.
DELTASPIKE-569 Improve DeltaSpikeResourceHandler handling