Revert 5e88a6b..8f04251

This rolls back to commit 5e88a6b777515a0973dcfc1d5bf28debd859d38f.