Revert 4648ed2..1c1a38c

This rolls back to commit 4648ed2e1fe900fb3911eb7c76f9c13ea74279b7.
Config