This reverts commit 5d5ee8014f. Reason for revert: Needs to wait until the next Codex release. Change-Id: Ia893484173e6623fbaf75133a0d7dc9cf7251444
5d5ee8014f