Revert 909bb31..978573f

This rolls back to commit 909bb310ebb443e56e9b24ae48cf5153f5ebcb0d.