Reverted for ubuntu environment