Revert 5512bd1..5e72467

This rolls back to commit 5512bd1f38a9c3702512bdc15ee7d9d7f32bb8cb.