Revert "Minor refactoring"

This reverts commit 100935fbda6cede822eac9b38dbbe19ae7943782.
It turns out the overflow problems still persists on Ubuntu 12.04.
Fix daily build script