Reverted due to buildbot failures resulting from failed compile due to a missing brace error that got into the original commit. This reverts commit 0aacd44a.