Reverted COLDBOX-361 in order to improve cleanups