This reverts r1222245 and should fix "Can not create drop shipment order" https://issues.apache.org/jira/browse/OFBIZ-4637 reported by Sergei Biletnikov and confirmed by mz4wheeler