Revert 544e71a..e2a0dd8

This rolls back to commit 544e71a03f34d9e0ff5c13228ba5cab9edc0425b.