Reverting FS-6292, pending more details from an end user thats working on this