Revert 2e80e62..3176759

This rolls back to commit 2e80e62542e305f99977fee2c9d860ad897fa0ab.