Revert "L4 merge"

This reverts commit e9c98dce31cd72ff8d60884cba37084625d382a7.