Revert 3357200..b0247fa

This rolls back to commit 3357200024648509c69c0c66488281940e5b2077.
config