Revert a7659d9..9ef1133

This rolls back to commit a7659d9723cd3718dac99733be9f81bbe1e4dc59.