Remove workaround for E-platform bug 45017 (fixed) Change-Id: Iaaf288c0af1c362cc80bc2503c7fb4fb5040f2ab