Revert "Merge remote-tracking branch 'origin/service-orders-all' into spring-schema"

This reverts commit 689053255b5308f4352d128597f781207548aba5, reversing
changes made to 71ada9624e7f0f90dadde828c6219342eb664535.