Revert a499db8..d037845

This rolls back to commit a499db85bca157969fa727b0276bd03e2901907d.