Revert 88c99db..2fae389

This rolls back to commit 88c99db7e9ee407f2643b98556e446a3d2ed06ae.