Let's hide its implementation for real this time. Change-Id: I18c82f4969f2e3560536a68e9bbd86b9282e2ace