Revert "Removed garbage, prepare for merge on old one"

This reverts commit e9d00122f26d1204ddb740e576133a5cbd9cb30b.