Revert b98a53d..7763423

This rolls back to commit b98a53decc53980de677329c6e994bf8a350ef65.