Simplified configuration, thanks @rogpeppe