Revert back to last commit's code. False bug.

ACE-62