Revert changes made in #92

See ticket for discussion