This has been merged, comment needs an update?