Revert c265411..4c93479

This rolls back to commit c2654119272509b3c46e9fb09cfe7e9f4a0beb13.