Revert a part of r214335 that I didn't mean to commit