Revert caebb3a..8d53561

This rolls back to commit caebb3a46ed66cca458bfac9879dd84db7b32099.