Revert 7d13c07..d887906

This rolls back to commit 7d13c07e4abc7c907792e9c7cc57a0499b43e462.