revert changes to be added in separate PR