Revert "Merge branch 'listing'"

This reverts commit a192e4fdca7140d2396f9333182caab9e5367dde, reversing
changes made to f05876f53ccc596a13eb894b7bf510fce7b736a3.