Reverted modules/features/intertwine_layout_2013 to yesterday's version.