Revert "Configuration changes"

This reverts commit b2aea9dff3efcb569a4d5b76fb01daae75a7d46b.