Tests for #1554, remove unneeded compatibility layer