Backed out changeset f82fd5479353 (bug 1107416) for failing static_assert.

--HG--
extra : rebase_source : 16a5480ba769555918961533f307d0dcbf238803