Get rid of restrict. Closes #552