Don't commit with this change, please follow up with @divega and @HaoK and @loudej to understand why this is needed.