Misc changes reverted back