Reverted to classic production settings approach