Revert 87f2f95..85b5342

This rolls back to commit 87f2f95c9d2225a208fd280b1bad49123f7eb660.