Backout 05c78f110edf, not needed for Fx20