Revert 7afd8e6..7de7a11

This rolls back to commit 7afd8e6d205c5c3a8722dd1b4e3a7f97c729312e.