Revert "Use standard linux additions"

This reverts commit 5edd5c57e0379b2a8a90175fff8003462b2c0671.