Revert 8269507..bfa2019

This rolls back to commit 8269507487d1b727511bb1200e5637ab1da5406a.