Revert " Merge Source 15.4.a.1.9"

This reverts commit 4fc903ae577c84edeb5defd42bde3285614d9227.