Revert breaking change.
Closes  #531