Revert 80ca759..3f9701d

This rolls back to commit 80ca759b7a76e63c8646bf6be03b3abd09160782.