(Bug 45194) Fix: Remove Bugfix that is now unnecessary

Bug: 45194
Change-Id: Ibb288aba0fd68f25ef012f82489d6f87d9bac072