Revert "Merge branch 'TWL007'"

This reverts commit 80e48c84a24c8d58282bc3d682b971feebc94038, reversing
changes made to 6965a03bbb0310684b717fa12da3f857e200f3d4.