Revert "fix ambiguous conversion errors for gcc 4.8"

This reverts commit 07fd08a1b0f29e21c08044d4101c57765bea1db0.