Revert interface changes so as to test the "O is null" bugfix

This reverts commit 36178ca1ca0236264ace5220d79a51e826bd70a3.