Revert c1dd141..d36ee80

This rolls back to commit c1dd141d2f876d48ec28c17fc041e52b43c90cfc.