Can you please revert the changes in this Schema.rb that are not specific for your MR?