Revert 8b852c0..536afe8

This rolls back to commit 8b852c03db52371bedfacebbfa0deff60cb4d16e.