This reverts commit a191075e.

This fix was superceded by commit 13a05eec
which is better abstracted.

Change-Id: I3b8ba735d279a50f5548a26fcc8fa6f790b2ea42