Reverted delivery engine changes re: delivery limitation injection attack, due to performance and accuracy concerns - possible breaches will be addressed separately. #91