Revert 1477ea4..d5fe5a6

This rolls back to commit 1477ea4ce5a6e99c6f81bf39d35234c260cb621e.