Revert "merge 15.4.A.1.9 source"

This reverts commit 0058f119b54de222fa7070296328a29b01cf23e0.