Reverting my patch to the Bakery module.