Revert "Closes #490."

This reverts commit ef1eb0967369a59593a94b69e2f6183c17e45d32.