As such I am not convinced that this "dummy" replacement class
approach is the right thing; we don't do it like that elsewhere
either?

Change-Id: Ife912d9ed91bd26610ea40cf4b446beb2ed481ec