Revert 55e3f02..3e6f5bf

This rolls back to commit 55e3f02fcc3cf39d39a155e09ea0589fc54a5c7a.