Revert "Even further optimization"

This reverts commit 1a59d25109af19f5c079d4dadb1eacee41750ad1.

Change-Id: Idf2b95593f3a8c97659d462e73cf6ba2024f8702