Revert c91cc3e..c1b1ff2

This rolls back to commit c91cc3e969b1cd1a3083eaf6fcd26e8c46141720.