Revert 27a23c4..fb267cc

This rolls back to commit 27a23c40e144fe9ef966813538d4723f79d807db.