Revert 515c9c1..67949a4

This rolls back to commit 515c9c1f0ad88278c07721fb0f90d705be0bb373.