Removed commented-out previous implementation.