Revert 25396d7..f0e048f

This rolls back to commit 25396d7137afdf1529424af73ffcf9329340901b.