Revert be0213c..cd5ded2

This rolls back to commit be0213c58a3a347ffb35c4163d0c703ceda297f1.