We reworked this 2 years ago, let's remove the historic reference. Change-Id: I30fcd5d4334a22dac5a539e73723ec260735feeb