Revert 7242107..86510e2

This rolls back to commit 72421074dde17927b032bd036440d5bc4b7a658c.