Revert 5e6331b..71619d4

This rolls back to commit 5e6331bbf3df669121e0861f491d7662019e2599.