Commented out configuration points so as to minimize impact of this work
on default configuration