Revert 995d70b..5dbdbec

This rolls back to commit 995d70bafc8865fbd5a99d0d533d04e19fe978d0.