So another argument for the layer refactoring before this commit :-)