* Reverted the optimization since it caused errors in travis-ci.