Revert source/resource file merge that clobbered Social Stream/Course Blog changes