Modified to revert spec change