Revert 2fdaf92..a865006

This rolls back to commit 2fdaf92b2dd287d42a6d1609429f78c74248951f.