revert commit 2913bc7bfb69029319a5ba0478422eaa8339ce8a
using patwood's config