Revert c8d9708..80cda1b

This rolls back to commit c8d97085798c63d57a617fc1cd776df14d7c3494.