Half of the stuff in #7260 didn't actually merge

Created by: DrCelt

thanks git #7260 @Skullyton @Clusterfack