Revert "E010"

This reverts commit 58edad9ada194b1547a16591a19e0524751c10f7.