Revert 434b29d..1704498

This rolls back to commit 434b29d514d9dcd82ff5d75b48d9dd12df22fae3.