Reverted destroyed code in last merge