Revert d58e3a7..781b808

This rolls back to commit d58e3a7831d654e7476238101abbf3765e53e31a.