Revert 2d299b5..9738f71

This rolls back to commit 2d299b5b45373a01fd3aac95d1f32949dc86c238.