Reverting due to failing ndebug tests. This reverts commit 9b688a09. Change-Id: Ie4f69da6609df3b7c8443412b6cf7f5c43c2c5d9