Revert "Changes to make the code work using petsc 3.4 and Ubuntu 14.04. We keep backwards compatibility."

This reverts commit 82ef9133acdaaf704375e170c8030c1c07d1520f.

Revert the changes to work in ubuntu 14.04 since the barkwards compatibility is not working as good as expected