Re #1273 Using MessageSource interface instead of a concrete implementation.