Revert 1a78172..d44743d

This rolls back to commit 1a7817210132e9f26e85ab29b597ef05ca2ecd2f.