Revert changes and allow <nil> interfaces instead