Revert changes for Ubuntu/Debian