FS-6245
FS-6245: add this for now until we figure out a better way
FS-6245: add this for now until we figure out a better way