Revert 6bbc619..238c8c6

This rolls back to commit 6bbc619b4768740c5fe11962089fb45e5704a266.