Replaced fix with authorized (and much simpler) solution

Change-Id: I25491c923960ffaf799f7b6e15429e1ea3a52658