Revert changes for #153