Revert 431da04..3fe4f66

This rolls back to commit 431da04de362a88fdc527dc47f1d1d0ed41107f4.