SFV-1384

Reverting changes as I discovered the underlying problem.