Miscellaneous changes to be reverted