Revert c8c89a0..eb40d78

This rolls back to commit c8c89a0a40240d109b6a89edcca6d73e4b8b13a8.