Revert changes made in #98

See ticket for discussion