Revert "fix ambiguous conversion errors for gcc 4.8"

This reverts commit 4a5893e5f0465a210407a51851941bd612aed94a.