Revert "Merge branch 'NickOfTime-FindTheObject'"

This reverts commit 631da6275759a20ca2696026f3abeaffca0e2659, reversing
changes made to de42c5804e026973a09889c4328ea486a4604402.