Revert 6339f50..9203f3b

This rolls back to commit 6339f509540798e2e6d9bd524944c41f90f64820.