[#1830] The community commits did not work out of the box, so reverting them for now. WIll return to this later.