Revert "Add CustomTypes to service providers"

This reverts commit 66b0c6c6f118e9d515e67cbf61cfa4107c7b457b.