cleanup temp fix as it was fixed differently.
Merge pull request #1232 from nouiz/cleanup_tmpfix

cleanup temp fix as it was fixed differently.